[ARVADOS] updated: 929a10688862adf8656d49a80c06ed83891274dc

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/assets/images/mouse-move.gif | Bin 26082 -> 26082 bytes
 docker/sso/Dockerfile                           |   1 +
 docker/sso/application.yml.in                   |  26 ++++++++++++++++++++++++
 services/crunchstat/crunchstat.go               |   8 +++++---
 4 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 docker/sso/application.yml.in

  discards  4adea935872d06d3f10a428553e6ce7159c5460f (commit)
       via  929a10688862adf8656d49a80c06ed83891274dc (commit)
       via  200f7004f921a68ec40b407dfe31f1db95e98fb9 (commit)
       via  02e1074d6020151e9854027df0ca218acb12fa29 (commit)
       via  b6f54ccb32e05348e9a5c76c7ed3211203cd4e55 (commit)
       via  d0f98546e68f6f7a714367d0bdbcc468ce217f3e (commit)
       via  ae6b514a98d89ce0bdfd47edd4508c42761cb049 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (4adea935872d06d3f10a428553e6ce7159c5460f)
            \
             N -- N -- N (929a10688862adf8656d49a80c06ed83891274dc)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 929a10688862adf8656d49a80c06ed83891274dc
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed May 6 22:57:06 2015 -0400

    4882: If -cgroup-cid flag is given, only read container stats. If not given, only read host stats.

diff --git a/services/crunchstat/crunchstat.go b/services/crunchstat/crunchstat.go
index 1982223..e149124 100644
--- a/services/crunchstat/crunchstat.go
+++ b/services/crunchstat/crunchstat.go
@@ -86,11 +86,19 @@ var reportedStatFile = map[string]string{}
 // cgroup root for the given statgroup. (This will avoid falling back
 // to host-level stats during container setup and teardown.)
 func OpenStatFile(cgroup Cgroup, statgroup string, stat string) (*os.File, error) {
-	var paths = []string{
-		fmt.Sprintf("%s/%s/%s/%s/%s", cgroup.root, statgroup, cgroup.parent, cgroup.cid, stat),
-		fmt.Sprintf("%s/%s/%s/%s", cgroup.root, cgroup.parent, cgroup.cid, stat),
-		fmt.Sprintf("%s/%s/%s", cgroup.root, statgroup, stat),
-		fmt.Sprintf("%s/%s", cgroup.root, stat),
+	var paths []string
+	if cgroup.cid != "" {
+		// Collect container's stats
+		paths = []string{
+			fmt.Sprintf("%s/%s/%s/%s/%s", cgroup.root, statgroup, cgroup.parent, cgroup.cid, stat),
+			fmt.Sprintf("%s/%s/%s/%s", cgroup.root, cgroup.parent, cgroup.cid, stat),
+		}
+	} else {
+		// Collect this host's stats
+		paths = []string{
+			fmt.Sprintf("%s/%s/%s", cgroup.root, statgroup, stat),
+			fmt.Sprintf("%s/%s", cgroup.root, stat),
+		}
 	}
 	var path string
 	var file *os.File

-----------------------------------------------------------------------


hooks/post-receive
--