Commit Graph

1167 Commits

Author SHA1 Message Date
Doug MacEachern 4a0dc0cef3 Merge branch 'sigar-1.6' into cleanup
Conflicts:
	bindings/SigarWrapper.pm
	src/os/netware/Makefile.nw
	src/os/netware/netware_sigar.c
	src/os/osf1/osf1_sigar.c
	src/os/stub/stub_sigar.c
2010-04-15 14:14:38 -07:00
Doug MacEachern f272cb2b5d netware no longer supported 2010-04-15 13:40:54 -07:00
Doug MacEachern 745508e3c0 update eclipse project classpath 2010-04-15 11:18:25 -07:00
Doug MacEachern 539056d24a Merge branch 'sigar-1.6' 2010-04-15 10:55:35 -07:00
Doug MacEachern c46af75d74 (SIGAR-201) JNIEnv->ExceptionCheck to avoid possible SEGV on OutOfMemoryError 2010-04-15 10:55:09 -07:00
Doug MacEachern a540dc045b Merge branch 'sigar-1.6' 2010-04-14 13:46:36 -07:00
Doug MacEachern 55002f1930 (SIGAR-213) check ENV.ANT_HOME/lib for junit in Main-Class 2010-04-14 13:46:28 -07:00
Doug MacEachern 7c94ba7164 Merge branch 'sigar-1.6' 2010-04-09 09:01:27 -07:00
Doug MacEachern 4227bf6ab9 (SIGAR-214) properly adjust jni.javahome when JAVA_HOME is not set 2010-04-09 09:01:13 -07:00
Doug MacEachern 9ce6361973 cpptasks patches moved to http://github.com/dougm/ant-contrib-cpptasks 2010-04-08 13:50:42 -07:00
Doug MacEachern cbfdc48167 Merge branch 'sigar-1.6' 2010-04-08 09:41:53 -07:00
Doug MacEachern b94783b9ad s,env.ANT_HOME/lib,ant.library.dir 2010-04-08 09:41:45 -07:00
Doug MacEachern c431fc185c Merge branch 'sigar-1.6'
Conflicts:
	bindings/java/src/org/hyperic/sigar/cmd/Shell.java
2010-04-07 21:27:57 -07:00
Doug MacEachern cd422901c9 (SIGAR-213) remove junit.jar from distribution 2010-04-07 21:23:56 -07:00
Doug MacEachern cf22b7f0a1 Merge branch 'sigar-1.6' 2010-04-04 10:26:06 -07:00
Doug MacEachern 6a0cd93cf5 fix rev-parse when not on a local branch 2010-04-04 10:25:58 -07:00
Doug MacEachern ccbd22fad6 Merge branch 'sigar-1.6' 2010-04-03 12:42:53 -07:00
Doug MacEachern 21a09f23d4 roll our own 'git rev-parse --short HEAD' 2010-04-03 12:41:06 -07:00
Doug MacEachern 48e01e86e3 Merge branch 'sigar-1.6' 2010-04-01 14:55:02 -07:00
Doug MacEachern 29c96e2343 (SIGAR-207) append instance index in Pdh.getInstances() 2010-04-01 14:53:25 -07:00
Doug MacEachern bdfd156a63 Merge branch 'sigar-1.6' 2010-04-01 14:49:15 -07:00
Doug MacEachern 2dc981dfa8 (SIGAR-207) Add Pdh.getCounterType method 2010-03-31 14:54:25 -07:00
Doug MacEachern 7905904cb6 (SIGAR-207) Add Pdh.getDescription method 2010-03-31 13:17:02 -07:00
Doug MacEachern e008252b86 Merge branch 'sigar-1.6' 2010-02-09 18:01:44 -08:00
Doug MacEachern e20e2eaa54 add -i (inode format) support to df command 2010-02-09 18:01:34 -08:00
Doug MacEachern eec4ba7e97 (SIGAR-199) add arp shell command 2010-01-18 19:09:11 -08:00
Doug MacEachern 34c0007c9a (SIGAR-199) add arp_list test 2010-01-18 19:09:11 -08:00
Doug MacEachern 9207af5536 (SIGAR-199) add Java ArpList binding 2010-01-18 19:09:11 -08:00
Doug MacEachern 818de4a64c Merge branch 'sigar-1.6' 2009-11-09 16:47:54 -08:00
Doug MacEachern 035a097325 only display event code in toString as the Event Viewer does 2009-11-09 16:45:06 -08:00
Doug MacEachern e86a150a8d 'N/A' for null user in EventLogRecord.toString 2009-11-09 16:34:31 -08:00
Doug MacEachern 32512cde90 include the same fields as Event Viewer in EventLogRecord.toString 2009-11-09 16:30:47 -08:00
Doug MacEachern 7cc2308fc8 Merge branch 'sigar-1.6' 2009-11-09 16:27:46 -08:00
Doug MacEachern 9cc30ca006 (SIGAR-191) fix EventLogRecord.computerName 2009-11-09 16:27:22 -08:00
Doug MacEachern f6be3e759e Merge branch 'sigar-1.6' 2009-11-09 16:18:25 -08:00
Doug MacEachern 3e4a408f74 (SIGAR-190) add category to EventLogRecord 2009-11-09 16:17:37 -08:00
Doug MacEachern dec7508ed1 Merge branch 'sigar-1.6' 2009-10-23 14:59:07 -07:00
Doug MacEachern a96bd1bc04 Pdh test adjustments for windows 2000 2009-10-23 14:52:51 -07:00
Doug MacEachern 32040563ce (SIGAR-185) fix RegistryKey open on windows 2000 2009-10-23 14:50:29 -07:00
Doug MacEachern b43ead331d Merge branch 'sigar-1.6' 2009-09-30 15:56:44 -07:00
Doug MacEachern 0d3d5e45da hpux pa 64-bit support 2009-09-30 15:46:36 -07:00
Doug MacEachern 0a9ed4aa00 Merge branch 'sigar-1.6' 2009-09-17 11:48:43 -07:00
Doug MacEachern 55167b6ebe 64-bit MacOSX 10.6 sdk does not support ppc64, switch from universal build to i386 only 2009-09-17 11:48:31 -07:00
Doug MacEachern d55a1fb20e Merge branch 'sigar-1.6' 2009-09-08 21:50:35 -07:00
Doug MacEachern cb1f3dafe7 fix MacOSX10.6.sdk build issues 2009-09-08 21:50:10 -07:00
Doug MacEachern 315c8474d9 fix Mac SDK selection 2009-09-02 17:48:38 -07:00
Doug MacEachern 6500952e5b use ArchNameTask to configure darwin sdk 2009-09-02 17:48:19 -07:00
Doug MacEachern a3260dc2fc fix Mac SDK selection 2009-08-18 13:20:17 -07:00
Doug MacEachern ff5aa70493 output NetInfo.getDefaultGatewayInterface 2009-08-15 06:11:02 -07:00
Doug MacEachern 5c8d1edbae add IFF_DYNAMIC to NetFlags 2009-08-12 10:13:13 -07:00