Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Automatic merge of 'ocf' into 'master'
- Loading branch information
felix-jenkins
authored and
jenkins-felix
committed
Sep 2, 2015
1 parent
ede91b0
commit 824bbe4
Showing
3,010 changed files
with
239,608 additions
and
0 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| *.class | ||
| *.pyc | ||
| *~ | ||
| egeni.db | ||
| *.pyc | ||
| .*.swp | ||
| test | ||
| *~ | ||
| \#*\# | ||
| *.aux | ||
| *.bbl | ||
| *.log | ||
| *.dvi | ||
| *.blg | ||
| *.out | ||
| .xpdf-running | ||
| *.orig | ||
| *.ngc | ||
| *.o | ||
| *.so | ||
| *\#* | ||
| *vsim* | ||
| *coregen* | ||
| .cproject | ||
| .project | ||
| chi_tool | ||
| pmac_tool | ||
| test.pl | ||
| fig-vnodes.dia | ||
| icing-tr.pdf | ||
| om.db | ||
| clearinghouse.db | ||
| .project | ||
| .pydevproject | ||
| db/openflow/optin_manager/om.db | ||
| secret_key.py | ||
| *.0 | ||
| *.launch | ||
| gcf-x509.*/ | ||
| expedient/src/python/expedient/clearinghouse/gcf-x509-user.crt/* | ||
| expedient/src/python/expedient/clearinghouse/gcf-x509-trusted.crt/* | ||
| expedient/src/static/expedient/clearinghouse/media/css | ||
| expedient/src/static/expedient/clearinghouse/media/js | ||
| expedient/src/static/expedient/clearinghouse/media/img | ||
| *.db | ||
| build/ | ||
| localsettings.py | ||
| vt_manager/src/python/vt_manager/settings.py | ||
| expedient/src/python/expedient/clearinghouse/localsettings.py | ||
| optin_manager/src/python/openflow/optin_manager/localsettings.py | ||
| vt_manager/src/python/agent/settings.py | ||
| vt_manager/src/python/vt_manager/mySettings.py | ||
| vt_manager/src/python/agent/mySettings.py | ||
| vt_manager/src/python/agent/.currentVersion | ||
| vt_manager/src/python/agent/security/certs/agent.crt | ||
| vt_manager/src/python/agent/security/certs/agent.key | ||
|
|
||
| expedient/.currentVersion | ||
| expedient/bin/log/* | ||
| expedient/bin/.upgradeReg | ||
| expedient/bin/.ofverLock | ||
| expedient/bin/rescue/* | ||
| ofam/.currentVersion | ||
| ofam/local/* | ||
| ofam/bin/log/* | ||
| ofam/bin/.upgradeReg | ||
| ofam/rescue/* | ||
| optin_manager/.currentVersion | ||
| optin_manager/bin/log/* | ||
| optin_manager/bin/.upgradeReg | ||
| optin_manager/bin/.ofverLock | ||
| optin_manager/rescue/* | ||
| vt_manager/.currentVersion | ||
| vt_manager/bin/log/* | ||
| vt_manager/bin/.upgradeReg | ||
| vt_manager/bin/.ofverLock | ||
| vt_manager/rescue/* | ||
| ofrelease | ||
| updater* | ||
| !.gitignore |
Oops, something went wrong.