Skip to content
  • P
    Projects
  • G
    Groups
  • S
    Snippets
  • Help

CIRCLE / storagedriver

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 2
  • Merge Requests 4
  • Wiki
  • Snippets
  • Members
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
Open
Merge request !13 opened Aug 29, 2016 by Bach Dániel@bachdaniel 
  • Report abuse
Report abuse

Snapshot operations

×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b issue_7 origin/issue_7

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff issue_7

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 4
  • Commits 3
  • Changes 2
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Bach Dániel
    @bachdaniel started a discussion on an old version of the diff Aug 29, 2016
    disk.py
    287 def common_snapshot_operation(self, cmdline):
    288 # Check if file already exists
    289 if not os.path.isfile(self.get_path()):
    290 raise Exception('Image does not exists: %s' % self.get_path())
    291 # Build list of Strings as command parameters
    292 if self.format == 'iso' or self.format == 'raw':
    293 raise NotImplemented()
    294 else:
    295 # Call subprocess
    296 try:
    297 return subprocess.check_output(cmdline)
    298 except subprocess.CalledProcessError as e:
    299 logger.error(e)
    300 raise Exception(unicode(e))
    301
    302 def snapshot(self, snapshot_name):
    • Bach Dániel @bachdaniel commented Aug 29, 2016
      Owner

      def create_snapshot?

      def create_snapshot?
    Please register or sign in to reply
  • Kálmán Viktor
    @kviktor started a discussion on an old version of the diff Aug 29, 2016
    disk.py
    284 284 logger.info("Extracting %s failed, keeping original.",
    285 285 disk_path)
    286 286
    287 def snapshot(self):
    287 def common_snapshot_operation(self, cmdline):
    288 # Check if file already exists
    289 if not os.path.isfile(self.get_path()):
    290 raise Exception('Image does not exists: %s' % self.get_path())
    291 # Build list of Strings as command parameters
    292 if self.format == 'iso' or self.format == 'raw':
    293 raise NotImplemented()
    294 else:
    • Kálmán Viktor @kviktor commented Aug 29, 2016
      Owner

      it's cleaner without the else's indentation imho

      it's cleaner without the else's indentation imho
    Please register or sign in to reply
  • Kálmán Viktor
    @kviktor started a discussion on an old version of the diff Aug 29, 2016
    disk.py
    284 284 logger.info("Extracting %s failed, keeping original.",
    285 285 disk_path)
    286 286
    287 def snapshot(self):
    287 def common_snapshot_operation(self, cmdline):
    288 # Check if file already exists
    289 if not os.path.isfile(self.get_path()):
    290 raise Exception('Image does not exists: %s' % self.get_path())
    291 # Build list of Strings as command parameters
    292 if self.format == 'iso' or self.format == 'raw':
    293 raise NotImplemented()
    294 else:
    295 # Call subprocess
    • Kálmán Viktor @kviktor commented Aug 29, 2016
      Owner

      these type of comments are not useful

      these type of comments are not useful
    Please register or sign in to reply
  • Kálmán Viktor
    @kviktor started a discussion on an old version of the diff Aug 29, 2016
    disk.py
    284 284 logger.info("Extracting %s failed, keeping original.",
    285 285 disk_path)
    286 286
    287 def snapshot(self):
    287 def common_snapshot_operation(self, cmdline):
    288 # Check if file already exists
    289 if not os.path.isfile(self.get_path()):
    290 raise Exception('Image does not exists: %s' % self.get_path())
    291 # Build list of Strings as command parameters
    • Kálmán Viktor @kviktor commented Aug 29, 2016
      Owner

      copypaste?:D

      copypaste?:D
    Please register or sign in to reply
  • Czémán Arnold @cemiarni

    Added 1 commit:

    • 73dd2d63 - some small fix
    Aug 30, 2016

    Added 1 commit:

    • 73dd2d63 - some small fix
    Added 1 commit: * 73dd2d63 - some small fix
    Toggle commit list
  • Czémán Arnold @cemiarni

    Added 1 commit:

    • f7949e20 - disk: fix disk permission problem
    Sep 12, 2016

    Added 1 commit:

    • f7949e20 - disk: fix disk permission problem
    Added 1 commit: * f7949e20 - disk: fix disk permission problem
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Czémán Arnold
Assignee
Czémán Arnold @cemiarni
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View labels
3
3 participants
Reference: circle/storagedriver!13