From 8f0088ebcb4c6925cb9a9fcc4e1cc0ca8e6ff881 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Wed, 6 May 2020 18:38:45 +0000 Subject: 2020-05-06T18:30:01Z --- calculate.html | 54 +++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 11 deletions(-) (limited to 'calculate.html') diff --git a/calculate.html b/calculate.html index 6ecdb95ac4f0..7b9922940137 100644 --- a/calculate.html +++ b/calculate.html @@ -30,27 +30,59 @@ 10
From git://git.calculate.ru/calculate/overlay
 
- 11
   e56663ab9..0274a5a64  develop    -> origin/develop
+            11
   988532acd..0274a5a64  master     -> origin/master
 
- 12
 + 8660a16c7...0274a5a64 mhiretskiy -> origin/mhiretskiy  (forced update)
+            12
   988532acd..0274a5a64  master64   -> origin/master64
 
- 13
   988532acd..0274a5a64  update     -> origin/update
+            13
 * [new tag]             2046       -> 2046
 
- 14
Already up to date.
+            14
Updating 988532acd..0274a5a64
 
- 15
*** syncing calculate
+            15
Fast-forward
 
- 16
*** synced calculate
+            16
 .../dev-libs/libcgroup/.calculate_directory        |  1 +
 
- 17
 * Sync succeeded
+            17
 .../2_ac_install_merge/dev-libs/libcgroup/cgconfig |  3 +
 
- 18
$ git log --format=%ci -1
+            18
 .../dev-libs/libcgroup/cgconfig.conf               |  5 ++
 
- 19
$ git show -q --pretty=format:%G? HEAD
+            19
 .../libcgroup/default/.calculate_directory         |  2 +
 
- 20
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 calculate
+            20
 .../dev-libs/libcgroup/default/cgconfig            |  1 +
 
- 21
 * Cache regenerated successfully
+            21
 .../profile.bashrc.d/50-server-protect             | 77 +++++++++++++---------
+
+ 22
 .../templates/3.6/6_ac_update_sync/remerge/0-ini   |  2 +-
+
+ 23
 .../3.6/6_ac_update_sync/remerge/2020/20200506     |  4 ++
+
+ 24
 8 files changed, 64 insertions(+), 31 deletions(-)
+
+ 25
 create mode 100644 profiles/templates/3.6/2_ac_install_merge/dev-libs/libcgroup/.calculate_directory
+
+ 26
 create mode 100644 profiles/templates/3.6/2_ac_install_merge/dev-libs/libcgroup/cgconfig
+
+ 27
 create mode 100644 profiles/templates/3.6/2_ac_install_merge/dev-libs/libcgroup/cgconfig.conf
+
+ 28
 create mode 100644 profiles/templates/3.6/2_ac_install_merge/dev-libs/libcgroup/default/.calculate_directory
+
+ 29
 create mode 100644 profiles/templates/3.6/2_ac_install_merge/dev-libs/libcgroup/default/cgconfig
+
+ 30
 create mode 100644 profiles/templates/3.6/6_ac_update_sync/remerge/2020/20200506
+
+ 31
*** syncing calculate
+
+ 32
*** synced calculate
+
+ 33
 * Sync succeeded
+
+ 34
$ git log --format=%ci -1
+
+ 35
$ git show -q --pretty=format:%G? HEAD
+
+ 36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 calculate
+
+ 37
 * Cache regenerated successfully
 
-- cgit v1.2.3-65-gdbad