Commit Graph

15 Commits

Author SHA1 Message Date
Doug MacEachern 4fe3feb198 Merge branch 'sigar-1.6'
Conflicts:
	bindings/java/src/org/hyperic/sigar/jmx/SigarCpu.java
	bindings/java/src/org/hyperic/sigar/jmx/SigarCpuInfo.java
	bindings/java/src/org/hyperic/sigar/jmx/SigarCpuPerc.java
	bindings/java/src/org/hyperic/sigar/jmx/SigarLoadAverage.java
	bindings/java/src/org/hyperic/sigar/jmx/SigarMem.java
	bindings/java/src/org/hyperic/sigar/jmx/SigarSwap.java
	bindings/ruby/examples/cpu_info.rb
	bindings/ruby/examples/df.rb
	bindings/ruby/examples/free.rb
	bindings/ruby/examples/ifconfig.rb
	bindings/ruby/examples/netstat.rb
	bindings/ruby/examples/pargs.rb
	bindings/ruby/examples/penv.rb
	bindings/ruby/examples/who.rb
2010-04-28 15:03:12 -07:00
Doug MacEachern 73f9b8cf84 GPL v2 license -> Apache 2 license
(grit-generated)
2010-04-28 14:57:11 -07:00
Doug MacEachern fd8274153c s/rbsigar/sigar/g 2010-01-17 19:00:26 -08:00
Doug MacEachern c6e8679079 include src/os/*.cpp 2009-08-05 17:22:08 -07:00
Doug MacEachern d1622a808d generate sigar_version.c 2009-07-18 21:56:44 -07:00
Doug MacEachern 4333771fc3 fix compile against ruby 1.9 2009-03-25 20:10:19 -07:00
Doug MacEachern aa605fcde1 make distclean incase of nfs shared dir 2009-02-16 17:53:10 -08:00
Doug MacEachern 36f7289082 fix for ruby 1.8.4 2009-02-16 17:36:53 -08:00
Doug MacEachern 52c3bb0191 fix for mswin64 2009-02-16 13:50:25 -08:00
Doug MacEachern 9e2576f7d6 need ftools for File.copy on windows 2009-02-15 20:15:22 -08:00
Doug MacEachern 9c759f0185 hpux extconf 2009-02-15 19:55:57 -08:00
Doug MacEachern 9835ea40c7 dont need ftools 2009-02-15 19:48:22 -08:00
Doug MacEachern 7a648166f1 add aix libs 2009-02-15 16:08:15 -08:00
Doug MacEachern 7cfb3b0570 ruby/extconf.rb now builds all sigar srcs 2009-02-15 15:21:59 -08:00
Doug MacEachern 8e156f28bd start ruby bindings 2007-09-03 00:49:22 +00:00