Gᴏɴɢ Jie 
							
						 
					 
					
						
						
							
						
						802ed5cbad 
					 
					
						
						
							
							Suppress the `index.attr, No such file or directory' error message from openssl ( #5456 )  
						
						
						
						
					 
					
						2018-08-02 17:00:22 +08:00 
						 
				 
			
				
					
						
							
							
								cxhong 
							
						 
					 
					
						
						
							
						
						ce42f6e03e 
					 
					
						
						
							
							block the command if run by non-root users ( #5438 )  
						
						
						
						
					 
					
						2018-07-27 10:52:24 +08:00 
						 
				 
			
				
					
						
							
							
								Bin Xu 
							
						 
					 
					
						
						
							
						
						961108c53b 
					 
					
						
						
							
							updatenode MERGE mode does not support update an existing entry  
						
						
						
						
					 
					
						2018-03-26 18:06:49 +08:00 
						 
				 
			
				
					
						
							
							
								cxhong 
							
						 
					 
					
						
						
							
						
						4038056879 
					 
					
						
						
							
							Add more print statement for config switches scripts ( #4872 )  
						
						... 
						
						
						
						* Add more print statement for config switches scripts
* modified from reviews
* more modify from review 
						
						
					 
					
						2018-03-06 11:25:38 +08:00 
						 
				 
			
				
					
						
							
							
								cxhong 
							
						 
					 
					
						
						
							
						
						9184d33e33 
					 
					
						
						
							
							remove remote host key from known_hosts file ( #4722 )  
						
						
						
						
					 
					
						2018-01-25 01:17:03 -06:00 
						 
				 
			
				
					
						
							
							
								cxhong 
							
						 
					 
					
						
						
							
						
						e501b26fd0 
					 
					
						
						
							
							issues for install license file on accton switches ( #4460 )  
						
						
						
						
					 
					
						2017-12-07 00:53:32 -06:00 
						 
				 
			
				
					
						
							
							
								cxhong 
							
						 
					 
					
						
						
							
						
						ac758a9c9d 
					 
					
						
						
							
							Modified configonie --ntp command ( #4436 )  
						
						
						
						
					 
					
						2017-12-04 23:48:33 -06:00 
						 
				 
			
				
					
						
							
							
								Miro 
							
						 
					 
					
						
						
							
						
						aaacca80cd 
					 
					
						
						
							
							Fix merging in xdcpmerge.sh ( #4328 )  
						
						... 
						
						
						
						* Fixes in xdcpmerge.sh
Two fixes:
1. The grep pattern when finding duplicate usernames is missing ":" at the end. So, for example user "test" would also match "test2, etc.". Adding the ":" delimiter fixes the issue.
2. Another issue happens when the file to be merged is a superset of the files on the nodes. For example, if a new user is added and entire passwd file (that is otherwise identical) is sent to be merged. In this case, the $filebackup.nodups file, i.e. the original file with duplicates removed, becomes empty and the condition "if [ -s "$filebackup.nodups" ]" does not execute. Then the merged file ends up being original file with the merge file fully appended, clearly not what was intended.
This is solved by changing the condition to check for file existence "-a" rather then for size. Additionally, I also turn the logic around so that the duplicates are removed from the merge file and then added to the original file. I think this makes logic a bit cleaner and also ensures that existing entries are not reordered or changed in any way.
* Streamlining previous commit
Adjustment to previous commit, streamlining and simplifying logic. Once $mergefile.nodups is created, just concatenate it the original file.
* Update to xdcpmerge
No need to copy $filebackup to $curfile, they are the same. 
						
						
					 
					
						2017-11-26 20:20:49 -06:00 
						 
				 
			
				
					
						
							
							
								Samveen Gulati 
							
						 
					 
					
						
						
							
						
						76b477c398 
					 
					
						
						
							
							Error redirection for checks  
						
						
						
						
					 
					
						2017-11-14 08:38:24 +00:00 
						 
				 
			
				
					
						
							
							
								Samveen Gulati 
							
						 
					 
					
						
						
							
						
						07add8e288 
					 
					
						
						
							
							Fix back multi-ip transfer from port to bridge  
						
						
						
						
					 
					
						2017-11-14 08:29:08 +00:00 
						 
				 
			
				
					
						
							
							
								Samveen Gulati 
							
						 
					 
					
						
						
							
						
						5e93ea3b39 
					 
					
						
						
							
							Fix logic for bridgeprereq parameter parsing  
						
						
						
						
					 
					
						2017-11-14 08:28:30 +00:00 
						 
				 
			
				
					
						
							
							
								Samveen Gulati 
							
						 
					 
					
						
						
							
						
						c4f4760eb4 
					 
					
						
						
							
							xHRM: migrate existing IP conf of $PORTS to bridge  
						
						
						
						
					 
					
						2017-11-14 07:38:26 +00:00 
						 
				 
			
				
					
						
							
							
								Samveen Gulati 
							
						 
					 
					
						
						
							
						
						99ae556314 
					 
					
						
						
							
							xHRM: more improvments via ShellCheck  
						
						
						
						
					 
					
						2017-11-14 07:38:26 +00:00 
						 
				 
			
				
					
						
							
							
								Samveen Gulati 
							
						 
					 
					
						
						
							
						
						817009c218 
					 
					
						
						
							
							xHRM: improvments via ShellCheck  
						
						
						
						
					 
					
						2017-11-14 07:38:26 +00:00 
						 
				 
			
				
					
						
							
							
								Samveen Gulati 
							
						 
					 
					
						
						
							
						
						3b05e6d633 
					 
					
						
						
							
							xHRM: modernize command substitution  
						
						
						
						
					 
					
						2017-11-14 07:38:26 +00:00 
						 
				 
			
				
					
						
							
							
								Chuck Brazie 
							
						 
					 
					
						
						
							
						
						a8a57f64a4 
					 
					
						
						
							
							Any updates since merge in October  
						
						... 
						
						
						
						Change-Id: I562c4069f5008a5faf71091fb243d349740052c1 
						
						
					 
					
						2017-10-19 14:18:47 -04:00 
						 
				 
			
				
					
						
							
							
								zet809 
							
						 
					 
					
						
						
							
						
						9c5446645e 
					 
					
						
						
							
							Merge pull request  #4110  from cxhong/3989  
						
						... 
						
						
						
						Add more configuration support for Mellanox switches 
						
						
					 
					
						2017-10-19 14:54:01 +08:00 
						 
				 
			
				
					
						
							
							
								Casandra Qiu 
							
						 
					 
					
						
						
							
						
						0f2cba3ce7 
					 
					
						
						
							
							use nic facing ip address instead of master  
						
						
						
						
					 
					
						2017-10-18 15:25:55 -04:00 
						 
				 
			
				
					
						
							
							
								zet809 
							
						 
					 
					
						
						
							
						
						a6661f84b7 
					 
					
						
						
							
							Merge pull request  #2927  from zVMopenstack/ZVM_XCAT_DEV  
						
						... 
						
						
						
						Merge the changes made for zVM into the xCAT development branch 
						
						
					 
					
						2017-10-18 17:06:31 +08:00 
						 
				 
			
				
					
						
							
							
								Casandra Qiu 
							
						 
					 
					
						
						
							
						
						eac35e7e3d 
					 
					
						
						
							
							Add more configuration support for Mellanox switches  
						
						
						
						
					 
					
						2017-10-16 15:26:37 -04:00 
						 
				 
			
				
					
						
							
							
								Yuan Bai 
							
						 
					 
					
						
						
							
						
						ac0ea2d2af 
					 
					
						
						
							
							fix xHRM fails when installnic is not set ( #4060 )  
						
						... 
						
						
						
						* fix xHRM fails when installnic is not set
* polished
* polished 
						
						
					 
					
						2017-10-10 03:49:52 -05:00 
						 
				 
			
				
					
						
							
							
								Chuck Brazie 
							
						 
					 
					
						
						
							
						
						c012b45ec1 
					 
					
						
						
							
							Merge branch 'master' into ZVM_XCAT_DEV  
						
						
						
						
					 
					
						2017-10-03 09:44:06 -04:00 
						 
				 
			
				
					
						
							
							
								cxhong 
							
						 
					 
					
						
						
							
						
						20e1e7213c 
					 
					
						
						
							
							Support config snmpv1/2 community string for Mellanox switches during discovery phase ( #4030 )  
						
						... 
						
						
						
						* Support config snmpv1/2 community string for Mellanox switches during
discovery phase
* checking snmpversion defined in the switches table 
						
						
					 
					
						2017-09-28 22:07:55 -05:00 
						 
				 
			
				
					
						
							
							
								Samveen Gulati 
							
						 
					 
					
						
						
							
						
						bf9a960140 
					 
					
						
						
							
							xHRM: fix minor code bug  
						
						
						
						
					 
					
						2017-09-19 12:24:57 +00:00 
						 
				 
			
				
					
						
							
							
								Casandra Qiu 
							
						 
					 
					
						
						
							
						
						85957476f9 
					 
					
						
						
							
							Add netmask to configonie script for change ip  
						
						
						
						
					 
					
						2017-09-14 16:43:31 -04:00 
						 
				 
			
				
					
						
							
							
								cxhong 
							
						 
					 
					
						
						
							
						
						6e5b960886 
					 
					
						
						
							
							Support syslog for Cumulus Switch ( #3850 )  
						
						
						
						
					 
					
						2017-09-06 10:19:19 +08:00 
						 
				 
			
				
					
						
							
							
								Bin Xu 
							
						 
					 
					
						
						
							
						
						2991ec1e59 
					 
					
						
						
							
							Fix 3749, handle '+' and '-' in id when merging /etc/passwd ( #3771 )  
						
						... 
						
						
						
						* Fix 3749, handle '+' and '-' in id when merging /etc/passwd
* Add some comments 
						
						
					 
					
						2017-08-25 15:13:51 +08:00 
						 
				 
			
				
					
						
							
							
								Chuck Brazie 
							
						 
					 
					
						
						
							
						
						e9029f484f 
					 
					
						
						
							
							Merge branch 'master' into ZVM_XCAT_DEV  
						
						
						
						
					 
					
						2017-08-09 09:31:22 -04:00 
						 
				 
			
				
					
						
							
							
								Victor Hu 
							
						 
					 
					
						
						
							
						
						4d046d4f4e 
					 
					
						
						
							
							Merge pull request  #3418  from cxhong/vlan  
						
						... 
						
						
						
						Support hybrid mode for different access vlan other than 1 
						
						
					 
					
						2017-07-19 23:14:37 -04:00 
						 
				 
			
				
					
						
							
							
								Casandra Qiu 
							
						 
					 
					
						
						
							
						
						749d3d54a3 
					 
					
						
						
							
							syntax error  
						
						
						
						
					 
					
						2017-07-13 14:19:15 -04:00 
						 
				 
			
				
					
						
							
							
								Casandra Qiu 
							
						 
					 
					
						
						
							
						
						f52c9cf041 
					 
					
						
						
							
							change vlan to VLAN  
						
						
						
						
					 
					
						2017-07-13 13:48:31 -04:00 
						 
				 
			
				
					
						
							
							
								cxhong 
							
						 
					 
					
						
						
							
						
						59738f65f9 
					 
					
						
						
							
							Configure Cumulus switch via switchdiscover --setup options ( #3375 )  
						
						
						
						
					 
					
						2017-07-10 22:17:15 -05:00 
						 
				 
			
				
					
						
							
							
								Casandra Qiu 
							
						 
					 
					
						
						
							
						
						29820ff808 
					 
					
						
						
							
							Support hybrid mode for different access vlan other than 1  
						
						
						
						
					 
					
						2017-07-07 18:31:13 -04:00 
						 
				 
			
				
					
						
							
							
								Chuck Brazie 
							
						 
					 
					
						
						
							
						
						ceb450587f 
					 
					
						
						
							
							Merge branch 'master' into ZVM_XCAT_DEV  
						
						
						
						
					 
					
						2017-06-19 08:04:09 -04:00 
						 
				 
			
				
					
						
							
							
								Casandra Qiu 
							
						 
					 
					
						
						
							
						
						0a3104a981 
					 
					
						
						
							
							check community string in the switches table  
						
						
						
						
					 
					
						2017-06-16 15:21:27 -04:00 
						 
				 
			
				
					
						
							
							
								cxhong 
							
						 
					 
					
						
						
							
						
						17d8358c3b 
					 
					
						
						
							
							Support user defined ip address for cumulus switch ( #3241 )  
						
						
						
						
					 
					
						2017-06-12 08:09:58 -05:00 
						 
				 
			
				
					
						
							
							
								Chuck Brazie 
							
						 
					 
					
						
						
							
						
						e8aa65e5fe 
					 
					
						
						
							
							Merge branch 'master' into ZVM_XCAT_DEV  
						
						
						
						
					 
					
						2017-06-12 08:07:38 -04:00 
						 
				 
			
				
					
						
							
							
								Casandra Qiu 
							
						 
					 
					
						
						
							
						
						d90eafb453 
					 
					
						
						
							
							modify  from code review  
						
						
						
						
					 
					
						2017-06-07 14:30:30 -04:00 
						 
				 
			
				
					
						
							
							
								Casandra Qiu 
							
						 
					 
					
						
						
							
						
						56fe5f4239 
					 
					
						
						
							
							change to < to <=  
						
						
						
						
					 
					
						2017-05-18 11:27:59 -04:00 
						 
				 
			
				
					
						
							
							
								Casandra Qiu 
							
						 
					 
					
						
						
							
						
						d7c78132ee 
					 
					
						
						
							
							Supports range of ports for tagging vlan command  
						
						
						
						
					 
					
						2017-05-18 09:54:27 -04:00 
						 
				 
			
				
					
						
							
							
								Casandra Qiu 
							
						 
					 
					
						
						
							
						
						d4383de06d 
					 
					
						
						
							
							modified from reviews  
						
						
						
						
					 
					
						2017-05-12 09:54:14 -04:00 
						 
				 
			
				
					
						
							
							
								zVMopenstack 
							
						 
					 
					
						
						
							
						
						a93190189e 
					 
					
						
						
							
							Merge branch 'master' into ZVM_XCAT_DEV  
						
						
						
						
					 
					
						2017-05-11 10:59:33 -04:00 
						 
				 
			
				
					
						
							
							
								Casandra Qiu 
							
						 
					 
					
						
						
							
						
						e9b8a3bbbf 
					 
					
						
						
							
							modification for configMellanox scripts  
						
						
						
						
					 
					
						2017-05-10 13:48:18 -04:00 
						 
				 
			
				
					
						
							
							
								Casandra Qiu 
							
						 
					 
					
						
						
							
						
						a17edd7080 
					 
					
						
						
							
							Support vlan configration for Mellanox Ethernet switch  
						
						
						
						
					 
					
						2017-05-05 09:53:28 -04:00 
						 
				 
			
				
					
						
							
							
								cxhong 
							
						 
					 
					
						
						
							
						
						1c51f5dcf4 
					 
					
						
						
							
							Supports snmpv3 configuration based on the attributes defined in the switches table ( #2956 )  
						
						... 
						
						
						
						* Supports snmpv3 configuration based on the switches table for onie switch
* fix typo 
						
						
					 
					
						2017-05-05 03:37:56 -05:00 
						 
				 
			
				
					
						
							
							
								zVMopenstack 
							
						 
					 
					
						
						
							
						
						7487c0322a 
					 
					
						
						
							
							Merge branch 'master' into ZVM_XCAT_DEV  
						
						
						
						
					 
					
						2017-04-24 09:39:38 -04:00 
						 
				 
			
				
					
						
							
							
								Casandra Qiu 
							
						 
					 
					
						
						
							
						
						55e6978e65 
					 
					
						
						
							
							Remove hard code of community and protocol value for snmp configuration  
						
						
						
						
					 
					
						2017-02-28 14:05:13 -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 
						 
				 
			
				
					
						
							
							
								Casandra Qiu 
							
						 
					 
					
						
						
							
						
						c0f9bd67a3 
					 
					
						
						
							
							change "is" to "does"  
						
						
						
						
					 
					
						2017-01-11 20:43:15 -05:00 
						 
				 
			
				
					
						
							
							
								Casandra Qiu 
							
						 
					 
					
						
						
							
						
						aaffcc2f4d 
					 
					
						
						
							
							Add default license file for configonie command  
						
						
						
						
					 
					
						2017-01-11 16:11:10 -05:00