Skip to content
This repository has been archived by the owner on Aug 14, 2020. It is now read-only.

deps: k8s.io/kubernetes: use v1.3.0-alpha.4 #614

Merged
merged 2 commits into from
May 26, 2016
Merged

deps: k8s.io/kubernetes: use v1.3.0-alpha.4 #614

merged 2 commits into from
May 26, 2016

Conversation

steveej
Copy link
Contributor

@steveej steveej commented May 26, 2016

d infDecAmount
// s is the generated value of this quantity to avoid recalculation
s []byte
// Amount is public, so you can manipulate it if the accessor
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jonboulle
Copy link
Contributor

It's extremely unclear to me why but apparently v1.3.0-alpha.3-1204-g9625926 (from #607) is ahead of v1.3.0-alpha.4 - even though if I check out the relevant commit myself (9625926852e215caa35e278c2cd7926744532291) it doesn't describe that way:

: trevize kubernetes master ; g log  v1.3.0-alpha.4..9625926852e215caa35e278c2cd7926744532291 -- pkg/api/resource/quantity.go
commit b2a01d4d94090b5efd81d0b71cb21bbb932c053a
Author: Clayton Coleman <[email protected]>
Date:   Tue May 17 00:35:40 2016 -0400

    Add an int64 quantity implementation

    Provides fast transformations of int64 scaled values with overflow to
    inf.Dec as needed. Attempts to reduce allocations and expensive
    operations in the critical path.

    Alters the public signature of Quantity to encourage more efficient use
: trevize kubernetes master ; g co 962592685
Note: checking out '962592685'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

  git checkout -b <new-branch-name>

HEAD ist jetzt bei 9625926852e2... Merge pull request #25574 from Clarifai/elb
: trevize kubernetes HEAD ; g describe --dirty
v1.3.0-alpha.4-205-g9625926852e2

@jonboulle
Copy link
Contributor

I can only suppose that the Godep process in #607 went wrong somehow /cc @dlorenc

@jonboulle
Copy link
Contributor

@steveej can you remove 29f1228 (i.e. un revert)

@alban
Copy link
Member

alban commented May 26, 2016

It's extremely unclear to me why but apparently v1.3.0-alpha.3-1204-g9625926 (from #607) is ahead of v1.3.0-alpha.4

It can happen if the person running godep didn't fetch the new tags (git fetch --tags) so godep only see that it is 1024 commits after v1.3.0-alpha.3 but don't see the remote tag v1.3.0-alpha.4.

@steveej could this be the case here?

@jonboulle
Copy link
Contributor

ah! great spot

On Thu, May 26, 2016 at 12:15 PM, Alban Crequy [email protected]
wrote:

It's extremely unclear to me why but apparently
v1.3.0-alpha.3-1204-g9625926 (from #607
#607) is ahead of v1.3.0-alpha.4

It can happen if the person running godep didn't fetch the new tags (git
fetch --tags) so godep only see that it is 1024 commits after
v1.3.0-alpha.3 but don't see the remote tag v1.3.0-alpha.4.

@steveej https://github.com/steveeJ could this be the case here?


You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
#614 (comment)

@jonboulle
Copy link
Contributor

@steveej rebase please

@jonboulle
Copy link
Contributor

and you'll need to drop ef295a2

@jonboulle
Copy link
Contributor

outstanding

@jonboulle jonboulle merged commit 8785f17 into appc:master May 26, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants