summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2020-12-30 13:34:58 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2020-12-30 13:34:58 +0000
commitc3711c226e7f1e0b0d766c1294c2ac6400348950 (patch)
tree6c288203066e0279208f1263793bc92944483817 /calculate.txt
parent2020-12-30T13:00:01Z (diff)
downloadrepos-c3711c226e7f1e0b0d766c1294c2ac6400348950.tar.gz
repos-c3711c226e7f1e0b0d766c1294c2ac6400348950.tar.bz2
repos-c3711c226e7f1e0b0d766c1294c2ac6400348950.zip
2020-12-30T13:30:01Z
Diffstat (limited to 'calculate.txt')
-rw-r--r--calculate.txt17
1 files changed, 14 insertions, 3 deletions
diff --git a/calculate.txt b/calculate.txt
index 5f41ac086cb5..d6ac4349f0c2 100644
--- a/calculate.txt
+++ b/calculate.txt
@@ -21,9 +21,20 @@ or --ff-only on the command line to override the configured default per
invocation.
From git://git.calculate-linux.org/calculate/calculate-overlay
- 6dd7bdc5e..3ceeb5837 develop -> origin/develop
- 261a098bc..3ceeb5837 mhiretskiy -> origin/mhiretskiy
-Already up to date.
+ 6dd7bdc5e..898ccc94a master -> origin/master
+ 3ceeb5837..898ccc94a develop -> origin/develop
+ 6dd7bdc5e..898ccc94a master64 -> origin/master64
+ 3ceeb5837..898ccc94a mhiretskiy -> origin/mhiretskiy
+ 6dd7bdc5e..898ccc94a update -> origin/update
+ * [new tag] 2312 -> 2312
+Updating 6dd7bdc5e..898ccc94a
+Fast-forward
+ .../3.6/2_ac_install_merge/net-misc/openssh/restart-openssh | 8 ++++++++
+ profiles/templates/3.6/6_ac_update_sync/remerge/0-ini | 2 +-
+ profiles/templates/3.6/6_ac_update_sync/remerge/2020/20201230 | 4 ++++
+ 3 files changed, 13 insertions(+), 1 deletion(-)
+ create mode 100644 profiles/templates/3.6/2_ac_install_merge/net-misc/openssh/restart-openssh
+ create mode 100644 profiles/templates/3.6/6_ac_update_sync/remerge/2020/20201230
*** syncing calculate
*** synced calculate
* Sync succeeded