unknown
|
be793dc8a4
|
temporarily remove localization stuff until Manuel fixs waf build.
|
2010-08-12 11:48:49 -07:00 |
|
jessica
|
c923149205
|
temporarily remove localization stuff until Manuel fixs waf build.
|
2010-08-12 11:46:22 -07:00 |
|
alena
|
8825147f0d
|
Merge branch '2.1.refactor' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.1.refactor
Conflicts:
server/src/com/cloud/configuration/ConfigurationManager.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
|
2010-08-12 11:41:02 -07:00 |
|
alena
|
a9d48a1b8a
|
Refactored updateDiskOffering and deleteDiskOffering commands
|
2010-08-12 11:27:37 -07:00 |
|
kelven
|
64221eff7b
|
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
|
2010-08-12 11:07:19 -07:00 |
|
abhishek
|
23444d5f07
|
Refactoring the updateZone command
|
2010-08-12 10:59:59 -07:00 |
|
Alex Huang
|
c3c5f7fa7c
|
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
|
2010-08-11 22:14:55 -07:00 |
|
Alex Huang
|
7f40fe0e07
|
not overwritten
|
2010-08-11 22:14:44 -07:00 |
|
Alex Huang
|
066f24dd4e
|
Changed the version number to use the date time. This way developer can still figure out which file they should look at.
|
2010-08-11 22:13:53 -07:00 |
|
edison
|
9963ec0a46
|
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
|
2010-08-11 19:33:44 -07:00 |
|
Kris McQueen
|
96f76062f9
|
Moving createDiskOffering to configurationManager, make AssignToLoadBalancer async
|
2010-08-11 19:32:09 -07:00 |
|
edison
|
dc005b9b9c
|
add setup_agent.sh, the first script running during add host
Make cloud-setup-agent/console-proxy in unattended mode
|
2010-08-11 19:31:07 -07:00 |
|
Manuel Amador (Rudd-O)
|
a852ae9386
|
Fix the typo that broke the build horribly
|
2010-08-11 18:17:01 -07:00 |
|
Manuel Amador (Rudd-O)
|
f11ac7acef
|
make it so cloud-gitrevs and cloud-sccs commands are in the packages
|
2010-08-11 18:16:37 -07:00 |
|
Manuel Amador (Rudd-O)
|
07addfed62
|
If git build sccs file is present, catenate it to standard output with these brand new commands
|
2010-08-11 18:14:55 -07:00 |
|
Manuel Amador (Rudd-O)
|
70a52991ba
|
backup files should, please, not be shown
|
2010-08-11 18:09:51 -07:00 |
|
Kris McQueen
|
06881fa28f
|
Merge branch '2.1.refactor' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.1.refactor
|
2010-08-11 17:53:44 -07:00 |
|
Kris McQueen
|
286d57f436
|
Remove old execute method from AssignToLoadBalancer.
|
2010-08-11 17:53:22 -07:00 |
|
Kelven Yang
|
117b24ce55
|
Git test check-in
|
2010-08-11 17:41:41 -07:00 |
|
Kris McQueen
|
2b27b63200
|
add the build/.project file that eclipse created to the gitignore list since I don't want to check it in
|
2010-08-11 17:22:31 -07:00 |
|
Kris McQueen
|
0c644a5ccb
|
Add EventUtils to consolidate the creation of events and make it usable from all managers (there were some private methods in ManagementServerImpl). Add some validation logic to AssignToLoadBalancer implementation in NetworkManagerImpl.
|
2010-08-11 16:53:03 -07:00 |
|
Kris McQueen
|
d2374d3178
|
Add EventUtils to consolidate the creation of events and make it usable from all managers (there were some private methods in ManagementServerImpl). Add some validation logic to AssignToLoadBalancer implementation in NetworkManagerImpl.
|
2010-08-11 16:52:15 -07:00 |
|
Alex Huang
|
eb28cbca63
|
more crap to fix git
|
2010-08-11 16:23:46 -07:00 |
|
Manuel Amador (Rudd-O)
|
14ae76781e
|
Committing Kris' big merge
|
2010-08-11 16:02:57 -07:00 |
|
Kris McQueen
|
c49cdb21d8
|
Remove comment from testing Git and Eclipse
|
2010-08-11 13:55:05 -07:00 |
|
Kris McQueen
|
2a2d618da9
|
Add a comment for testing Git and Eclipse
|
2010-08-11 13:54:07 -07:00 |
|
edison
|
49a8f1d9ce
|
test
|
2010-08-11 11:42:52 -07:00 |
|
Alex Huang
|
49ec1136a2
|
ignore files
|
2010-08-11 11:31:22 -07:00 |
|
Alex Huang
|
621a37b6c8
|
bug 5890: Changed all of the build stuff to work better with git
|
2010-08-11 11:16:29 -07:00 |
|
Manuel Amador (Rudd-O)
|
eba391d8b8
|
ignore ant artifacts
|
2010-08-11 11:16:29 -07:00 |
|
Manuel Amador (Rudd-O)
|
7abe7ed3f6
|
ignore waf artifacts and temp files, take 2
|
2010-08-11 11:15:40 -07:00 |
|
Manuel Amador (Rudd-O)
|
5fdeefb4da
|
build number file does not belong in the repo. ignored and deleted.
|
2010-08-11 11:14:52 -07:00 |
|
Manuel Amador (Rudd-O)
|
b4c09112d4
|
gitignore ignores cloudstack-proprietary
|
2010-08-11 11:04:07 -07:00 |
|
Manuel Amador (Rudd-O)
|
3fdd7afb3c
|
gitignore ignores build number and other stuff now
|
2010-08-11 11:03:49 -07:00 |
|
abhishek
|
1493aadfcf
|
test
|
2010-08-11 10:55:46 -07:00 |
|
abhishek
|
1ac797382a
|
test
|
2010-08-11 10:49:05 -07:00 |
|
abhishek
|
698eff4776
|
Another test commit, to remove the previous comment i checked in
|
2010-08-11 10:39:05 -07:00 |
|
abhishek
|
c0e7b3de4f
|
Test commit by Abhishek
|
2010-08-11 10:26:05 -07:00 |
|
Alex Huang
|
e6c41146f7
|
bug 5890,5873: Try multiple bug checkins
status 5890: resolved fixed
status 5873: resolved invalid
|
2010-08-11 09:59:25 -07:00 |
|
Alex Huang
|
91dd446600
|
bug 5890: Another try
status 5890: resolved worksforme
|
2010-08-11 09:53:23 -07:00 |
|
Alex Huang
|
5ce356333e
|
Issue #: 5890 Another try
Status 5890: resolved worksforme
|
2010-08-11 09:51:22 -07:00 |
|
Alex Huang
|
3318f6dcb4
|
Issue #: 5890 Changes to projects to work in git
Status 5890: resolved works for me
|
2010-08-11 09:41:15 -07:00 |
|
Manuel Amador (Rudd-O)
|
df5aa16f3c
|
Merge branch 'master' into 2.1.refactor
|
2010-08-11 09:13:42 -07:00 |
|
Manuel Amador (Rudd-O)
|
ac730ec496
|
Branch 2.1.refactor committed
|
2010-08-11 09:13:42 -07:00 |
|
Manuel Amador (Rudd-O)
|
9d5c1f2dcf
|
Fix build system in preparation for repo split
|
2010-08-11 09:13:29 -07:00 |
|
Manuel Amador (Rudd-O)
|
05c020e1f6
|
Source code committed
|
2010-08-11 09:13:29 -07:00 |
|
Manuel Amador (Rudd-O)
|
2b78b78272
|
Initial commit: adding .gitignore
|
2010-08-11 09:13:25 -07:00 |
|