Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
S
simmctic
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 1
    • Issues 1
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Incidents
    • Environments
  • Analytics
    • Analytics
    • CI / CD
    • Repository
    • Value Stream
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • simmctic
  • simmctic
  • Merge Requests
  • !883

Merged
Opened Nov 12, 2019 by Rafael Dias@rpd17Guest
  • Report abuse
Report abuse

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/66" "origin/issue/66"

Step 2. Review the changes locally

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

git fetch origin
git checkout "develop"
git merge --no-ff "issue/66"

Step 4. Push the result of the merge to GitLab

git push origin "develop"

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

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

Issue #66: Add unique index to aggr_net_usage_by_day

  • Overview 0
  • Commits 1
  • Pipelines 1
  • Changes 2

Para executar a função select load_monitoring_dw();, sem problemas foi necessário criar o index unico em database/view/aggr_net_usage_views.sql.

Na consulta portal/reports/reports/cvtAvail.jrxml, não existe elemento telecentro por isso foi substituido por tech_vocational_center

Signed-off-by: rafaelcosc rpd17@inf.ufpr.br

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: simmctic/simmctic!883
Source branch: issue/66

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.