Backout the immediately previous changes to common files.

diff --git a/open-vm-tools/lib/include/conf.h b/open-vm-tools/lib/include/conf.h
index 76c100919c01d4be190343d54f0f6ac894d1e19d..3f82e19dc4074a491961664761ee212b10386245 100644 (file)
--- a/open-vm-tools/lib/include/conf.h
+++ b/open-vm-tools/lib/include/conf.h
@@ -495,24 +495,4 @@
  ******************************************************************************
  */
 
-/*
- ******************************************************************************
- * BEGIN CarbonBlack goodies.
- */
-
-/**
- * Define the string used for carbonblack config file group
- */
-#define CONFGROUPNAME_CARBONBLACK "carbonblack"
-
-/**
- * Defines user-defined polling interval in seconds.
- */
-#define CONFNAME_CARBONBLACK_POLLINTERVAL "poll-interval"
-
-/*
- ******************************************************************************
- * END CarbonBlack goodies.
- */
-
 #endif /* __CONF_H__ */

diff --git a/open-vm-tools/tools.conf b/open-vm-tools/tools.conf
index ea1fe047bb4553f5509ca1b4e615ceefb9beae50..a697e1184feab252d6573a8e2b2230362572431d 100644 (file)
--- a/open-vm-tools/tools.conf
+++ b/open-vm-tools/tools.conf
@@ -315,10 +315,3 @@
 
 # to disable guest customization
 #enable-customization=false
-
-[carbonblack]
-
-# The carbonblack plugin is only available for Windows.
-
-# User-defined poll interval in seconds. Set to 0 to disable polling.
-#poll-interval=60