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
This commit is contained in:
commit
4fe3feb198
275 files changed
+3723
-3630
No files matched your search
@@ -1,3 +1,19 @@
|
||||
/*
|
||||
* Copyright (c) 2008 Hyperic, Inc.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "sigar.h"
|
||||
|
||||
@@ -1,3 +1,19 @@
|
||||
/*
|
||||
* Copyright (c) 2006 Hyperic, Inc.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "sigar.h"
|
||||
|
||||
Reference in new issue
Block a user