Merge commit 'origin/master'

diff --git a/db-config.d/010-slice_tags b/db-config.d/010-slice_tags
index de66d03..535c735 100644 (file)
--- a/db-config.d/010-slice_tags
+++ b/db-config.d/010-slice_tags
@@ -36,6 +36,9 @@ slicetag_types = \
     {'tagname': "cpu_share",
      'description': "Number of CPU shares",
      'category' : 'slice/rspec'},
+    {'tagname': "cpu_cores",
+     'description': "Number of CPU cores",
+     'category': 'slice/rspec'},
     
     # Bandwidth limits
     {'tagname': "net_min_rate",