Closed sebhtml closed 9 years ago
By the way, the hash identifiers of the cherry-picked commits are different from what they originally were because any commit sha1 hash depends on the hash (or hashes) of parent(s).
Yes, I'd like to merge just the change on the shock service (1a30b96).
OK. I will close this request and create a new one.
Hi Fangfang,
I reset my dev branch to cb2f233 ("Merge pull request #303 from levinas/ff") and then I cherry picked 5b92a65 ("client: add command view-data which is equivalent to stat --data") and 1a30b96 ("shock-client: throw an exception if shock service is down"). As requested in your review, I discarded 5223c26 ("client: refactor a variable") to keep the client source code small.
The commit 7f7676693 basically add a command to list the datasets. The command "arast view-data --data 18" is equivalent to "arast stat --data 18".
Tell me if you also don't want commit 7f7676693. In that case, I will reset my dev branch again and cherry pick only 1a30b96 which basically add an exception when the Shock service is down.