xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 03:12:30 +00:00
Code Issues Releases Wiki Activity
19,086 Commits 22 Branches 79 Tags
1166d003ad3cef73741cf00382b38196d5a4c04c
Commit Graph

19086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chuck Brazie
1166d003ad remove elilo from spec files, remove aa from line 277 in 
zvmdiagnostics.pm

Change-Id: Ifb2ee4200ccc9d8294764609904ac9d0ab555f7c
 2017-02-24 14:02:49 -05:00
Chuck Brazie
05ae41dd03 Merge pull request #16 from chuckbrazie/ZVM_XCAT_DEV_removeQuote 
Remove double quote
 2017-02-23 14:56:36 -05:00
Chuck Brazie
dff6c298fa Remove double quote 
Change-Id: I73cf4db54f5c9ede7d29be8acb04fe733ecb075b
 2017-02-23 14:54:32 -05:00
Chuck Brazie
ec48419d18 Merge pull request #15 from chuckbrazie/ZVM_XCAT_DEV_updateVersion 
Update version and release
 2017-02-22 15:05:02 -05:00
Chuck Brazie
a26fff1fbf Update version and release 
Change-Id: Id4b63e64c26e3f478b972e9d395ba11a7b0f0e47
 2017-02-22 14:57:33 -05:00
Chuck Brazie
460e96a5db Merge pull request #14 from chuckbrazie/ZVM_XCAT_DEV_missingPHPfile 
New file
 2017-02-22 11:41:19 -05:00
Chuck Brazie
015f8bb455 New file 
Change-Id: I0559cdd03f6f7dba7c757ba23d995556e97067fe
 2017-02-22 11:40:29 -05:00
Chuck Brazie
89108ddeb1 Merge pull request #13 from chuckbrazie/ZVM_XCAT_DEV_xcatwsCgi 
Add in version 1 and version 2 REST-API into zVM. Default zVM to version
 2017-02-21 09:15:39 -05:00
Chuck Brazie
5bab3873a2 Add in version 1 and version 2 REST-API into zVM. Default zVM to version 
1 in the zvmxcatws.cgi

Change-Id: I2ad620ded8f4f3bff997bf308881cbeabd61022b
 2017-02-20 15:33:44 -05:00
Chuck Brazie
6acd927236 Merge pull request #12 from chuckbrazie/ZVM_XCAT_DEV_addFilesJs 
Add in new files.js I forgot to do in previous merge
 2017-02-14 14:32:03 -05:00
Chuck Brazie
15a9cf5616 Add in new files.js 
Change-Id: I1e81519fe006f9f78d327dd03be054d52dd3f599
 2017-02-14 14:30:08 -05:00
Chuck Brazie
d52f124d64 Merge pull request #11 from chuckbrazie/ZVM_XCAT_DEV_IVP_misc_updates 
A few updates to get latest IVP, some bugzillas. 4275-4299
 2017-02-13 15:31:16 -05:00
Chuck Brazie
25866ba7a7 A few updates to get latest IVP, some bugzillas. 4275-4299 
Change-Id: I332800769a556f5174d77f84b130ccbb542a0d95
 2017-02-13 15:09:29 -05:00
Chuck Brazie
6783a4d455 Merge pull request #10 from chuckbrazie/ZVM_XCAT_DEV_Merge_xCAT-server 
Merge our code with global xCAT team except for xcatws.cgi
 2017-02-02 14:38:09 -05:00
Chuck Brazie
5a83bf5e63 Merge our code with global xCAT team except for xcatws.cgi 
Change-Id: I945c430685fa2febd914be09f6a6f976783abeec
 2017-02-02 14:31:27 -05:00
Chuck Brazie
651cdaaaa1 Merge pull request #9 from chuckbrazie/ZVM_XCAT_DEV_merge_xCAT-client 
merge of xCAT_Client plus add one new file missed in xCAT
 2017-02-01 14:16:27 -05:00
Chuck Brazie
a4b658037f merge of xCAT_Client plus add one new file missed in xCAT 
Change-Id: Iaa3b073333e75c64f7a0da35fb6dd1228e822059
 2017-02-01 14:13:16 -05:00
Chuck Brazie
b289287527 Merge pull request #8 from chuckbrazie/ZVM_XCAT_DEV_merge_xCAT 
Merge with xCAT team code for directory "xCAT"
 2017-01-31 09:22:48 -05:00
Chuck Brazie
81f91d771d Merge with xCAT team 
Change-Id: Ifd3638c8a978c4354c1aa7c9a0a0725c731144e9
 2017-01-31 09:19:48 -05:00
Chuck Brazie
761ba13b99 Merge pull request #7 from chuckbrazie/ZVM_XCAT_DEV_perl-xCAT_updates 
Perl-xCAT merge updates into 2.13
 2017-01-30 10:20:23 -05:00
Chuck Brazie
5c5e59dc4d Perl-xCAT merge updates into 2.13 
Change-Id: I8338c02d541608a6bc339b07e1270c178be6a415
 2017-01-30 10:13:57 -05:00
Chuck Brazie
93c2872e9d Merge pull request #6 from chuckbrazie/ZVM_XCAT_DEV 
Secure cookies merge into global xCAT team UI. A few other changes also.
 2017-01-23 10:43:15 -05:00
Chuck Brazie
e413f23264 Secure cookies merge into global xCAT team UI. A few other changes also. 
Change-Id: I529160b9e2c31c86aca7c2c1ad32559c43ab4aea
 2017-01-23 10:05:07 -05:00
zVMopenstack
d97f844b99 Merge pull request #5 from xcat2/2.13 
2.13 update from xcat team to our fork
 2017-01-13 14:39:37 -05:00
zVMopenstack
812088b6d9 Merge pull request #4 from xcat2/master 
Get the latest from xCAT team
 2017-01-13 14:14:03 -05:00
neo954
fd5babbbfa Merge pull request #2357 from tingtli/ntp 
add makentp case to synchronize time with external ntp server
 2017-01-13 03:24:41 -06:00
zet809
acd51946e2 Update README.rst 2017-01-13 17:05:29 +08:00
zet809
fc98911bc9 Update Version 2017-01-13 16:57:35 +08:00
tingtli
0320ffb2ae Merge pull request #2408 from zet809/add_info_to_xcat2releasefino 
add 2.13.x release information in documents
 2017-01-13 13:54:08 +08:00
ertaozh
6059a5c09e add 2.13.x release information in documents 2017-01-13 00:53:24 -05:00
ertaozh
1e0fa18312 add 2.13.x release information in documents 2017-01-13 00:30:32 -05:00
litingt@cn.ibm.com
4f3d7e7864 update according to comments 2017-01-12 03:11:48 -05:00
Weihua Hu
970d45fb3a Merge pull request #2403 from xuweibj/I2391 
fix issue 2391, modify probe result format
 2017-01-12 15:35:55 +08:00
XuWei
3bf88020c4 fix issue 2391, modify probe result format 2017-01-11 22:25:48 -05:00
zet809
62bd7a4072 Merge pull request #2401 from xcat2/master 
Merge master to 2.13 branch for 2.13.1 release.(3)
2.13.1 		2017-01-11 21:38:50 +08:00
yangsong
3a498cd01d Merge pull request #2399 from zet809/fix_issue_about_xcat_genesis_base_spec 
xCAT-genesis-base.spec can not access the Release file, use snap+date…
 2017-01-11 00:48:10 -06:00
ertaozh
0ff2925985 xCAT-genesis-base.spec can not access the Release file, use snap+date directly 2017-01-11 01:42:08 -05:00
Weihua Hu
b8e3be7464 Merge pull request #2380 from whowutwut/xcat_probe 
Move the copy/cleanup code for xCAT-probe to their own functions in makerpm
 2017-01-11 11:22:12 +08:00
Weihua Hu
11a57ab824 Merge pull request #2397 from immarvin/onaddkcmdline 
fix issue Unsupported character in bootparams.addkcmdline #2392
 2017-01-11 10:31:01 +08:00
immarvin
fdbf2166e1 fix issue Unsupported character in bootparams.addkcmdline #2392 2017-01-10 21:20:09 -05:00
yangsong
2f1e5accc1 Merge pull request #2395 from cxhong/onie 
Change switchtype from cumulus to onie
 2017-01-10 18:49:00 -06:00
Casandra Qiu
f843dcad3c Change switchtype from cumulus to onie 2017-01-10 15:38:14 -05:00
Victor Hu
068494a9ae Use the variable for the path instead of hard code 2017-01-10 14:25:05 -05:00
Victor Hu
fda382ab27 Merge pull request #2394 from xcat2/master 
Merge master to 2.13 branch for 2.13.1 release.(2)
 2017-01-10 13:44:02 -05:00
Victor Hu
0ca0a09783 Merge pull request #2393 from whowutwut/2.13.remove_checks 
Remove the legacy error checking in buildcore.sh
 2017-01-10 12:06:08 -05:00
Victor Hu
e090a4e9a1 Remove the error checking in buildcore.sh. In our autobuild 
environment, the build does a new git clone each time, so it's
no longer necessary.  Keep the warning message
 2017-01-10 11:57:55 -05:00
Victor Hu
d58327a2f1 Merge pull request #2390 from whowutwut/fix_release_file 
Fix the issue with restoring the Release file at the end of buildcore.sh
 2017-01-10 09:58:00 -05:00
Victor Hu
9c1d637829 Fix the issue with restoring the Release file because at the end of the 
buildcore.sh script, the CWD is not the git repo.  Use full path

Add the Release.save* file into the .gitignore in order to not track
this temporary file during the build
 2017-01-10 09:45:06 -05:00
zet809
1cbb3883cd Merge pull request #2328 from cxhong/ntpfile 
File /etc/sysconfig/ntpd doesn't exists in the SLES
 2017-01-10 22:26:16 +08:00
zet809
ae037ed33f Merge pull request #2389 from xcat2/master 
Merge master to 2.13 branch for 2.13.1 release.(1)
 2017-01-10 17:47:14 +08:00