version: sync version with master branch

Submitted by Adrian Reber on July 6, 2018, 6:37 a.m.

Details

Message ID 1530859068-1407-1-git-send-email-adrian@lisas.de
State Rejected
Series "version: sync version with master branch"
Headers show

Commit Message

Adrian Reber July 6, 2018, 6:37 a.m.
From: Adrian Reber <areber@redhat.com>

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 Makefile.versions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/Makefile.versions b/Makefile.versions
index f92388e..996f544 100644
--- a/Makefile.versions
+++ b/Makefile.versions
@@ -1,10 +1,10 @@ 
 #
 # CRIU version.
 CRIU_VERSION_MAJOR	:= 3
-CRIU_VERSION_MINOR	:= 6
+CRIU_VERSION_MINOR	:= 9
 CRIU_VERSION_SUBLEVEL	:=
 CRIU_VERSION_EXTRA	:=
-CRIU_VERSION_NAME	:= Alabaster Finch
+CRIU_VERSION_NAME	:= Sand Martin
 CRIU_VERSION		:= $(CRIU_VERSION_MAJOR)$(if $(CRIU_VERSION_MINOR),.$(CRIU_VERSION_MINOR))$(if $(CRIU_VERSION_SUBLEVEL),.$(CRIU_VERSION_SUBLEVEL))$(if $(CRIU_VERSION_EXTRA),.$(CRIU_VERSION_EXTRA))
 
 export CRIU_VERSION_MAJOR CRIU_VERSION_MINOR CRIU_VERSION_SUBLEVEL

Comments

Andrey Vagin July 8, 2018, 2:31 a.m.
No, no, no. We have to rebase criu-dev over master.
I am preparing a new criu-dev branch:

https://github.com/avagin/criu/tree/criu-dev-next

On Fri, Jul 06, 2018 at 06:37:48AM +0000, Adrian Reber wrote:
> From: Adrian Reber <areber@redhat.com>
> 
> Signed-off-by: Adrian Reber <areber@redhat.com>
> ---
>  Makefile.versions | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile.versions b/Makefile.versions
> index f92388e..996f544 100644
> --- a/Makefile.versions
> +++ b/Makefile.versions
> @@ -1,10 +1,10 @@
>  #
>  # CRIU version.
>  CRIU_VERSION_MAJOR	:= 3
> -CRIU_VERSION_MINOR	:= 6
> +CRIU_VERSION_MINOR	:= 9
>  CRIU_VERSION_SUBLEVEL	:=
>  CRIU_VERSION_EXTRA	:=
> -CRIU_VERSION_NAME	:= Alabaster Finch
> +CRIU_VERSION_NAME	:= Sand Martin
>  CRIU_VERSION		:= $(CRIU_VERSION_MAJOR)$(if $(CRIU_VERSION_MINOR),.$(CRIU_VERSION_MINOR))$(if $(CRIU_VERSION_SUBLEVEL),.$(CRIU_VERSION_SUBLEVEL))$(if $(CRIU_VERSION_EXTRA),.$(CRIU_VERSION_EXTRA))
>  
>  export CRIU_VERSION_MAJOR CRIU_VERSION_MINOR CRIU_VERSION_SUBLEVEL
> -- 
> 1.8.3.1
>
Adrian Reber July 8, 2018, 6:52 a.m.
On Sat, Jul 07, 2018 at 07:31:28PM -0700, Andrei Vagin wrote:
> No, no, no. We have to rebase criu-dev over master.
> I am preparing a new criu-dev branch:
> 
> https://github.com/avagin/criu/tree/criu-dev-next

No problem, I just had to change it locally for runc tests and thought I
just share it. If this file is updated in another way I am also happy.

		Adrian

> On Fri, Jul 06, 2018 at 06:37:48AM +0000, Adrian Reber wrote:
> > From: Adrian Reber <areber@redhat.com>
> > 
> > Signed-off-by: Adrian Reber <areber@redhat.com>
> > ---
> >  Makefile.versions | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/Makefile.versions b/Makefile.versions
> > index f92388e..996f544 100644
> > --- a/Makefile.versions
> > +++ b/Makefile.versions
> > @@ -1,10 +1,10 @@
> >  #
> >  # CRIU version.
> >  CRIU_VERSION_MAJOR	:= 3
> > -CRIU_VERSION_MINOR	:= 6
> > +CRIU_VERSION_MINOR	:= 9
> >  CRIU_VERSION_SUBLEVEL	:=
> >  CRIU_VERSION_EXTRA	:=
> > -CRIU_VERSION_NAME	:= Alabaster Finch
> > +CRIU_VERSION_NAME	:= Sand Martin
> >  CRIU_VERSION		:= $(CRIU_VERSION_MAJOR)$(if $(CRIU_VERSION_MINOR),.$(CRIU_VERSION_MINOR))$(if $(CRIU_VERSION_SUBLEVEL),.$(CRIU_VERSION_SUBLEVEL))$(if $(CRIU_VERSION_EXTRA),.$(CRIU_VERSION_EXTRA))
> >  
> >  export CRIU_VERSION_MAJOR CRIU_VERSION_MINOR CRIU_VERSION_SUBLEVEL
> > -- 
> > 1.8.3.1
> >